[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 skip reason: skipped by user ctate

Change-Id: Ibdc01ddb9c15d895efbc13d62b4fd65c0a5184e5