Merge "Merge "Hide player on keyguard when notif are hidden" into rvc-dev am:...
Merge "Merge "Hide player on keyguard when notif are hidden" into rvc-dev am: 6c88ccc7 am: 189434f9 am: ad040388" into rvc-qpr-dev-plus-aosp am: 3a0b6a6a
Change-Id: I4503de1d3e81809f36608c9f58af34714e8056e4