[automerger skipped] Allow system server uid to bypass location restriction am: 1dddfe1f am: 27a13f97 -s ours am: ee2f0d36 -s ours

am skip reason: Merged-In Ic869da4847e4f39896861f3bf6e83f6f6c76ea62 with SHA-1 1dddfe1f is already in history

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



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