Merge "Refactor BluetoothHeadset APIs used by Settings"