Merge "Merge "Handle multi-user when disabling MediaMetrics service." into...

Merge "Merge "Handle multi-user when disabling MediaMetrics service." into tm-dev am: 448ae113 am: 842116d3" into tm-d1-dev-plus-aosp am: 6116b919

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



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