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

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

Change-Id: Ib4ad18c7602728e546721cc084fff13586923169