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

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

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



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