Revert "Bluetooth: Move to proper state."

This reverts commit 5b479b6ebd69cd58d7f78d4b6afd589aae7a0890.
This appears to cause state issues with broadcom adapters
(reconnection loops and missed disconnects were observed)
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0