Merge "Refactor android.server.BluetoothService classes."