[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: 5c930498 -s ours am: 1171cda7 -s ours am: 8036761d -s ours am: 4d824471 -s ours

am skip reason: subject contains skip directive

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



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