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

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

Change-Id: I814d70b1d5e819749b7d4e3283c84060d695ce16