[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: c5769399 am: 2a0d35c5 am: c4c74b77 -s ours

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

Change-Id: Iffbc40de487071667c788f8f1c42b26d5a44a344