[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 skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 2b1ed5b7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I243c7cde552d2848a1a7f4bea6e828e409328bcc