Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into pi-dev