[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: 05b6703f am: e2f4d7dc am: 5094e5e2 -s ours

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

Change-Id: I49cd3d2c0320e85ddb26aa1e2798df23f5fe0fc9