am 8d51f710: Merge change Icdd2864e into eclair

Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-plus-aosp

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth