Merge "Disallow privileged apps to bypass location restriction" into tm-dev...

Merge "Disallow privileged apps to bypass location restriction" into tm-dev am: a9c0327c am: 501c0ada am: b33589ad am: 6ff42c4c

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



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