Merge "Fix the phone process crash due to null UiccPort object access" into tm-dev am: b1a2dea1b6 am: 767a4b366b am: 6fbb7cde46

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/18287287

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