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 am: 1bda7f5a am: 8c73348d

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



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