Merge "Merge "Filter media controls by user" into rvc-dev am: c781b2e4 am:...

Merge "Merge "Filter media controls by user" into rvc-dev am: c781b2e4 am: b2f71ffe am: 6c0a3237" into rvc-qpr-dev-plus-aosp am: c006e523

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

Change-Id: I6d36e22a77e719508152120f6ebe924ad8a8a596