[automerger skipped] Merge "Clean up Telephony tests" into stage-aosp-master...

[automerger skipped] Merge "Clean up Telephony tests" into stage-aosp-master am: 88e1b502 am: f43c038b -s ours am: 77992987 -s ours

am skip reason: Merged-In I31f204353b7bc8677352a48f50c4b5aae91d9825 with SHA-1 33ef3360 is already in history

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



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