Merge "Fix the phone process crash due to null UiccPort object access" am: f80c7cd72a

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

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