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

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

Change-Id: Ic3a2f315ca5b6ad20ffb1fa886142ef773bc4b43