[automerger skipped] Fixed port index is not updated when iccid is active but...

[automerger skipped] Fixed port index is not updated when iccid is active but slot is inactive am: 12259326 am: 9dfe2d55 -s ours am: 3c8174a0 -s ours

am skip reason: Merged-In I57cf260bbd73fa390be1e24a18591104111d9b4f with SHA-1 e20f8b94 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2681804



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