[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into sc-dev am: 3fe61746df am: a16d02f7af -s ours am: b40b6315d4 -s ours

am skip reason: subject contains skip directive

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

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