Merge "Filter media controls by user" into rvc-dev am: c781b2e4b0 am: bd9761b1a5 am: 99a275ead6 am: 45023b7903

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

Change-Id: I20aed62f5d1f4f7c1df75dd1871833050022443f