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 am: 48138443

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



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