[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: 15de2746 am: 8614bc42 am: 715ab68a -s ours

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

Change-Id: Ife4afb02f3a9e0b302a113a5101750be5e817602