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

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



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