[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to...

[automerger skipped] Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into tm-dev am: bf1f22d0 am: 7614a25d am: c3cab1ce am: cff074e1 -s ours

am skip reason: subject contains skip directive

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



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