Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev am: 5fa99c33 am: c0edca93 am: 1c6cce31 am: 7d517056

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



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