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 am: 5105260a am: 80ba8203

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



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