[automerger skipped] Allow system server uid to bypass location restriction am: 1dddfe1f am: 6df07033 am: 98862939 -s ours am: 044f0a60 -s ours am: f70bd058 -s ours am: 11157d83 -s ours am: b3094f1a -s ours

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

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



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