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

Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" am: 569b04a1 am: e218309f

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



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