Merge "Fix two NPEs in TelephonyConnection" am: 4851b4b90b am: 0efd089ffe am: 03745989a9 am: 4015318e30
am: 98f50ccfef

Change-Id: Ifaef0e1a8e9df9ab5bc2b14dfa64a05af73c6c5f