Merge "Protect GrantCredentialsPermissionActivity against overlay. am:...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029378

Change-Id: Ie8f7611e411f7b980e84821a715029c3f11f5aaf