[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to...

[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into tm-dev am: bf1f22d0 am: 8d70d0f0 am: f6dff442 am: ad2f3172 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320595



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