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

Change-Id: I495f84a96ad4249522b61d1553153593a10fea55