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