Merge "[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: 6ca71a167c -s ours" into rvc-qpr-dev-plus-aosp