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

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

Change-Id: Ibed4f47c55f3251052fe85170d9a633e35ffeb55