Merge "Hide player on keyguard when notif are hidden" into rvc-dev am: 6c88ccc77e

Change-Id: I106a8de807e9c9856a937df3f7727ce73f91c6a6