Merge "Merge "Add test for MediaControlPanel" into rvc-dev am: 0606dd56 am:...
Merge "Merge "Add test for MediaControlPanel" into rvc-dev am: 0606dd56 am: c7d8ccce am: 7060b345" into rvc-qpr-dev-plus-aosp am: 86f8a2e6
Change-Id: I8905bea0c2a4693f6004e8f3270c957f72bc9110