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: 0e70f575

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



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