Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169
am: 8f50f01f8b
am: 02c3704871
am: bf93beaefd
Change-Id: Iba31c6f523a1558f09b47b9996d2a475bad6fb27
This commit is contained in: