Merge "Filter media controls by user" into rvc-dev am: c781b2e4b0 am: b2f71ffe1a

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

Change-Id: If61f02fe79bd60164478732a43e76c990dbe9ce5