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

Merge commit '811f655366461d0f21f970bcac07dd2084fd54fa' into eclair-mr2-plus-aosp

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