[automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 am: 6717abba6e -s ours am: 953586c0e7 -s ours am: 558392e1ed -s ours am: 4beba29d08 -s ours am: e1555adbb1 -s ours am: 9bba8bed31 -s ours

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

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

Change-Id: If97adf07cab3bf3a34af4d8c73b6c0887a849ed3