Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev am: 5fa99c33 am: c0edca93 am: de6a8247

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



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