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: c34a4597

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



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