[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 tm-dev am: 969cb772 am: f8c6feff -s ours am: 55de28ad -s ours

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

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



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