Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: eaeb13c583 am: 98b15ce956

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

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