[automerger skipped] Merge "Fix the phone process crash due to null UiccPort object access" am: f80c7cd72a am: b45835773f -s ours

am skip reason: Merged-In Iea14a99b824ac67f8d006c7bc68c7dffa6ce1b9e with SHA-1 e53e07d9c1 is already in history

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

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