Merge "Fix two NPEs in TelephonyConnection"