Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity"