Merge "Merge "Filter media controls by user" into rvc-dev am: c781b2e4b0 am: b2f71ffe1a am: 6c0a3237c9" into rvc-qpr-dev-plus-aosp