Merge "Fix two NPEs in TelephonyConnection" into oc-mr1-dev
am: c8e7134083

Change-Id: I9ca181aea1dc35f72b31c91f60ff8125c248e255