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