Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp am: 50db25d330 am: da63c1a4cf am: c594be9bee
Change-Id: I9b52c7c4dbddd396f3001b159854251e0bf100d3
This commit is contained in: