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 am: a7b489b701
Change-Id: Id8729a4bda5db26e2e159ce94292d1bcf031217e
This commit is contained in: