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

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



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