Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev