Merge "Merge "Turn on QS media player by default" into rvc-dev am: ee47af62...
Merge "Merge "Turn on QS media player by default" into rvc-dev am: ee47af62 am: e831608d am: af7b5256" into rvc-qpr-dev-plus-aosp am: c39e3906
Change-Id: Ibb180624ecd6143ede80870d34a010111c1e70ae