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

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



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