Merge change 23699 into eclair

* changes:
  b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.