Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev...
Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 am: 1b29836d" into nyc-mr1-dev-plus-aosp
am: 50c23a24
* commit '50c23a24':
Change-Id: I1305cf2026c6e46d7d87915a81da7cc5fbf46f8f