Merge "Refactor BluetoothAdapter APIs used by Settings"