[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev am: 4837c8a971 -s ours am: 69eed6d337 -s ours am: 8f769e1796 -s ours am: 530654b082 -s ours am: c22f684455 -s ours am: 1c80119aff -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia01d554b1b366540d3edfa9dc5f6b7f662662936