Merge "Merge "Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev...

Merge "Merge "Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev am: 5fa99c33" into tm-dev-plus-aosp am: 4a4b6326" into tm-d1-dev-plus-aosp am: eb3fb84d

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



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