Merge "Fixing few TelephonyManager calls to work when there is no SIM." into nyc-dev
am: d248787

* commit 'd248787f182a5c88e77cc1d996769f6971d13a7c':
  Fixing few TelephonyManager calls to work when there is no SIM.

Change-Id: I67207baa20f9aee25605777ddff6393a8967d71f