Merge "Cleanup testSatelliteModeRadios" into udc-dev am: b9266470 am: 04021dc6 am: ddfae3c5

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



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