Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev...

Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: 54090718 am: 9bca2e2c am: 36fabac3 am: 4b9ee685 am: 50f534a8 am: f143a2eb

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

Change-Id: Ief605f0f1714dbf6e2dd444598f7791a70dfbf56