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

[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e14 am: b070447e -s ours am: 2d22fe6e -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/+/12940358

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64a068ccd312d66a480752097e4f05e1d3903bb7