Merge change Icdd2864e into eclair

* changes:
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth