Merge "Fix null pointer exception in TelephonyConnection" am: 282b7c9eeb am: 733c36ad6e

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

Change-Id: Icc4d9185d11c9af15ddd65f8ea540bdb1ebc98d6