Merge "[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-qpr-dev am: 5e971858b8 am: 5c5e30f40b -s ours"