[automerger skipped] Merge "Revert "Revoke 'always' web handler status when...

[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into qt-qpr1-dev am: 968e9edb -s ours am: 999f82c1 am: 81623066 am: 8c7a60e3 am: 67bbebf8 -s ours

am skip reason: Change-Id If9046cb420961b8ef0333e9f1115eb69fb92242e with SHA-1 0a96f46e is in history

Change-Id: I508844719ac2b5fa4f49cd46dc37090cc4068a4b