[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 skip reason: Change-Id I983fa with SHA-1 4f008458 is in history

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

Change-Id: I7e3f3995e2a087f9a28f5f1836628d9f56170ab4