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: c9d29066

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

Change-Id: I9f1800fc03693b0160b55cae5291a07d674f3850