[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-v2-dev am: 0d6e82ae -s ours am: 02677308 -s ours am: 0f986a37 -s ours am: 4a32d520 -s ours

am skip reason: subject contains skip directive

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



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