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

[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into sc-dev am: 3fe61746 am: a16d02f7 -s ours am: b40b6315 -s ours am: 4f87ba04 -s ours am: db631b82 -s ours

am skip reason: subject contains skip directive

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



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