[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-qpr1-dev am: 6a3adcb5 -s ours am: c1a8a1d9 -s ours am: 98e413f4 -s ours am: b391605e -s ours am: 7ceca873 -s ours am: 0b704bb3 -s ours

am skip reason: subject contains skip directive

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



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