Merge "Fix two NPEs in TelephonyConnection"
am: 4851b4b90b

Change-Id: I93fb2890c528cb37261d151b3713717fca36e1f9