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

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

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