Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: 54090718 am: 9bca2e2c am: 36fabac3 am: 4b9ee685 am: 50f534a8 am: 2260e041 am: 740099f6 am: 276d0054

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

Change-Id: I38320ebabc836afd083c81ae022478afdba856c9