Merge "Fix null pointer exception in TelephonyConnection" into rvc-dev am: f03cde13be

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

Change-Id: I3e30abe56c76b14b1656fcfa372073e69458120a