Merge "Update tests with location bypass packages" into tm-dev am: 39926e4d...

Merge "Update tests with location bypass packages" into tm-dev am: 39926e4d am: a0efceaf am: c5bd06af am: 60b2c4f7

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



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