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

[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into rvc-dev am: 7f7dff72 am: ffde524a am: 0ec7f645 -s ours am: aa5707d1 -s ours

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

Change-Id: I52b11bbecf56f482dbe12503fbf86ace3a708c38