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

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

Change-Id: I806cdc06ff9a87efe096cb3ccdb22d358ce59947