[automerger skipped] Merge "Check the permission of the callingUid instead of...

[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-qpr-dev am: 6cd8230c -s ours

am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 e719575e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226854



Change-Id: I9a760db5f4bc94e426d5294a79a10cba81c40def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>