Merge "[automerger skipped] Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into qt-dev am: 0eaa0926 -s ours am: e597de39 -s ours am: 7f41d9cd -s ours am: 26229159 -s ours" into rvc-qpr-dev am: e5cc8ec8 -s ours am: e459d1cb -s ours

am skip reason: Change-Id I36d9c352e741e88b9fc773b084bef3991b6d96ed with SHA-1 01052441 is in history

Change-Id: I9c8a81effcc0afe8d225924c1d2bfe0f3d12cecf