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

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

Change-Id: I2e77ef169d3034d148bbc44fd71da878ff50dd94