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

Change-Id: I78b142bf31e49e4742c3e368213971fe112bfa12