Merge "Update midi services owner to avoid singleton" into main am: c668fc9e58 am: 965dc85baf

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

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