Merge "Remove BluetoothMidiService and DeskClock" into nyc-car-dev