Merge "Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1 am: 3f47c701 am: 765788de am: 3be814cb am: b3485671" into rvc-qpr-dev-plus-aosp