[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-dev am: 54ee76b6 am: c9a7157c -s ours am: 4df8ee00 -s ours

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

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



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