[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from...

[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev am: 9109ce17 -s ours am: b2dd5af4 -s ours am: 4f456879 -s ours am: c1416828 -s ours am: 31ba467a -s ours am: b53a4559 -s ours am: 204ae74c -s ours am: 46746671 -s ours

am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940359

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabe6f14aeeb1214bf7880ab641e98db3755da5b0