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

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

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



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