[automerger skipped] Merge "Remove remaining messages after Telephony tests...

[automerger skipped] Merge "Remove remaining messages after Telephony tests end" am: c50f9a2e am: 131092fb am: 00b10a23 -s ours am: b9b3bc57 -s ours

am skip reason: Merged-In I9d5f5b50d2425ef044203351e15f428838213534 with SHA-1 380d2271 is already in history

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

Change-Id: If97c6b524b6692e60e5219b04daff9fd09cdc950