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

Change-Id: I9016f0bc71ef25806857d37df821688a17143912