Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: f9ce76989c am: ee6d6adf2f

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

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