[automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b
-s ours am: 78f62d8269
-s ours am: e5a837a9d8
-s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830
Change-Id: If3f51a0cd31f94cde5abd59503fed5672de6f9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: