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

Change-Id: I705ccabfeb060dccbff53676293506501e3398cc