Merge change 21985 into eclair

* changes:
  Fix AudioService on HFP power off due to new Bluetooth API.