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

[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a9 -s ours

am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 0220a57e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9eb1410bc5afb447219ad31ccc83469d1e60bc3