Merge "Allow system server uid to bypass location restriction" into tm-dev am: f209ae03

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



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