[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: bb7117b1 am: 2757b3c7 -s ours

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

Change-Id: Ib7fb3ae190a73a7db21a384a29cb1d44e481a793