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

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

Change-Id: I2a939fe3620ef80abc22f9796f3082d1277951ac