[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into pi-dev am: 6906bf5f4a -s ours

am skip reason: Change-Id Ifac4f0c044c2c575a29bdd5ce5d14d12373fbe70 with SHA-1 e09a792002 is in history

Change-Id: Ibc3115cd3cc30d50e748bd9287f1c9672460fb5d