[automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours am: 74112f0ef9 -s ours am: 89824dff8a -s ours am: ff76d65706 -s ours am: 9e6fd1aeae -s ours am: b0fe0debbc -s ours am: 203b8de32e -s ours

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

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

Change-Id: Ib9a7e7c20ca82dbcec0a994b46cf969bc7ba9824