Revert "Rollback Bluetooth changes for now."

This reverts commit abf66847cc824ac09aef80ba3d0059c8fafad865.

Change-Id: Ib3c2317e159c9b3bdba5fdcb02aeaf2683f883b5