Merge change I14fb81af into eclair

* changes:
  Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn