Merge "USB MIDI: Multijack MIDI 1.0 for MIDI 2.0 devices" into udc-dev am:...

Merge "USB MIDI: Multijack MIDI 1.0 for MIDI 2.0 devices" into udc-dev am: 3b4472fc am: 4301df6f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21522284



Change-Id: Ida980f13743f5dc8125eaf1ad04ea20cf3c88d99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>