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

[automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b -s ours am: 81a5d7b6 -s ours am: 82d37340 -s ours

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

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



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