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

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

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



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