Merge "[automerger skipped] Protect GrantCredentialsPermissionActivity against...

Merge "[automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784 am: 21e36702 am: f312c9e8 am: 6717abba -s ours am: 953586c0 -s ours am: 558392e1 -s ours am: 4beba29d -s ours am: e1555adb -s ours am: 6ca71a16 -s ours" into rvc-qpr-dev-plus-aosp am: 9b6b2656 -s ours

am skip reason: Change-Id I15dd22791fcc61ef02b06ad51d9e4409d11c0181 with SHA-1 b6b8b048 is in history

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

Change-Id: I840e041ceb3112056a15cb0c1e3ade4acc57cb52