Merge "Cleanup testSatelliteModeRadios" into udc-dev am: b9266470 am: b52287fa am: 123a58ab

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



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