Merge "Add MIDI info to USB dumpsys" into tm-dev