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: 09945a82

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



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