[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into sc-qpr1-dev am: 6a3adcb520 -s ours am: c1a8a1d9c4 -s ours am: 98e413f443 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18319513 Change-Id: I40792a3d82777d055a21338adc1089959a59ff65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: