Merge "Update midi services owner to avoid singleton" into main am: c668fc9e am: c6c5cfca

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



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