Merge change 24773 into eclair

* changes:
  Fix NPE in TelephonyManager.