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

[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7 am: 90cd6229 -s ours am: f3e40ede -s ours

am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 3ebeb4c4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If66f2a01ed913dc187a437377e0eda6372a950dc