[automerger skipped] Clean up Telephony tests am: 01c5e5be -s ours am:...

[automerger skipped] Clean up Telephony tests am: 01c5e5be -s ours am: c20676b7 -s ours am: f173b049 -s ours am: 7c64d9e4 -s ours

am skip reason: Merged-In I31f204353b7bc8677352a48f50c4b5aae91d9825 with SHA-1 67b0f728 is already in history

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



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