am e4f5e840: am 811f6553: am 8d51f710: Merge change Icdd2864e into eclair

Merge commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5'

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