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

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

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