Merge "Revert "Ignore GrantCredentials call with unexpected calling uid.""...

Merge "Revert "Ignore GrantCredentials call with unexpected calling uid."" into pi-dev am: 888ba5ee am: 1d3492e1 am: 427ee435 am: 5c9473a9 am: c91980e2 am: 4e48a06f

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

Change-Id: Ie9565799d64daab2bfcce4e44ba8b048d42dc90e