Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev