Revert "Revert "Rollback Bluetooth changes for now.""

  * Still causing too many problems. Going to back off from this until
    device maintainers check off on it.

This reverts commit 5e2d55e73b294a2f82f76aedc7a49df05641f305.
Merge branch 'cm-11.0' into martincz