[automerger skipped] Merge "Clean up Telephony tests" am: adc1a639 -s ours...

[automerger skipped] Merge "Clean up Telephony tests" am: adc1a639 -s ours am: 866993a8 -s ours am: e1832676 -s ours am: 61202cf1 -s ours am: 5654b6ae -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: Ibd5533f12d8866488d5145d4f47988ef5dc74c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>