[automerger skipped] Merge "Ignore GrantCredentials call with unexpected...

[automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a -s ours am: 2d91b0fc -s ours am: 9aaffcb7 -s ours am: 54c83951 -s ours

am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114 is in history

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

Change-Id: I77a92f64de96eed1a2769f77da233f581dab53b3