[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7b9 am: 529a15704a -s ours

am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 82a2e2d841 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If49b4211c0a4a37664ca4e60d26c34bd30f4ae37