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: I7dae908a168f6d91dcd2c1728f3137a1d888b788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>