Merge "Merge "Ignore GrantCredentials call with unexpected calling uid." into...

Merge "Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f am: f0263a93 am: 42900081 am: 5ec7e0d4 am: 273b5c12" into rvc-qpr-dev-plus-aosp am: 04b85124

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

Change-Id: I6c2d447cb0a498a4961d27b4301c162e5ee69b4a