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

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

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