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

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



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