Merge "Protect GrantCredentialsPermissionActivity against overlay. am: f45dcfe1f5 am: 3f47c701f1 am: 765788de9a am: 3be814cbff am: b348567101" into rvc-qpr-dev-plus-aosp