[automerger skipped] Ignore GrantCredentials call with unexpected calling uid....

[automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77 am: 2e5fe473 am: 2d868147 -s ours am: d6d6f262 -s ours am: 74112f0e -s ours am: 89824dff -s ours am: ff76d657 -s ours am: 9e6fd1ae -s ours am: 6ad890e9 -s ours am: 8d63401c -s ours

am skip reason: Change-Id I983fa with SHA-1 bbdc8318 is in history

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

Change-Id: I0b5ec878b6a4bac917b95849d120181e11f5a22a