[automerger skipped] Merge "Update tests with location bypass packages" am:...

[automerger skipped] Merge "Update tests with location bypass packages" am: a9d6d086 -s ours am: 09e43ea4 -s ours

am skip reason: Merged-In If1dcd8129c61b328efe491845942550ff61cf8a1 with SHA-1 4f4b2fd7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2160078



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