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

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

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