Merge "NPE fix when reading the port index from uiccslot in logger" into main...

Merge "NPE fix when reading the port index from uiccslot in logger" into main am: a15c24b2 am: e3f4bec1 am: c02a427a am: 4578560c am: b691f6c5 am: 4fd16d1e

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



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