[automerger skipped] Merge "Update LocationAccessPolicyTest for location allowlist" am: 2575e2a13e -s ours am: 03a45a096f -s ours

am skip reason: Merged-In Ia9a77b41df53ff9603c6062bc1f5838820039b6e with SHA-1 cc5205c99e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2160206

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