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

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



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