Merge "Merge "Prompt to unlock if player is tapped on lockscreen" into rvc-dev...
Merge "Merge "Prompt to unlock if player is tapped on lockscreen" into rvc-dev am: 7042dff5 am: 89c1d943 am: 531ee7f9 am: 813194fd" into rvc-qpr-dev-plus-aosp am: 9f9afe5b
Change-Id: I9a6ef85b504bb258eff38ddd01e7d1e813becb10