Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: 5409071886 am: 9bca2e2c06 am: 36fabac3e9 am: 4b9ee68510 am: 50f534a82e am: f143a2eb14

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

Change-Id: Ief605f0f1714dbf6e2dd444598f7791a70dfbf56