[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: 96b120ee -s ours am: 2e079d17 -s ours am: f023dc59 -s ours

am skip reason: subject contains skip directive

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



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