Merge "Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 42db36efbe am: ba670c95e8" into rvc-qpr-dev-plus-aosp am: cc6748ef0c
Change-Id: Ieae2af592fd1c36802ff5d754134c61a6c8069e3
This commit is contained in: