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

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

Change-Id: If9907ce916e413965fd49c809947bb3babf62515