Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for...

Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63 am: caf536d7 am: 265db399 am: 883c7dca am: 7e27acce am: 13d984ac am: fda5884b am: b1b6ec6f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680



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