[automerger skipped] Ignore GrantCredentials call with unexpected calling uid. am: 88787b77a0 am: 2e5fe473e1 am: 2d868147e4 -s ours am: d6d6f2621d -s ours

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

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

Change-Id: I4ae22cd07e6f913e0431a1da89867670907d6157