Merge "Fixed port index is not updated when iccid is active but slot is...

Merge "Fixed port index is not updated when iccid is active but slot is inactive" into udc-dev am: 6444ca66 am: afc2e10b

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



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