Merge "Prompt to unlock if player is tapped on lockscreen" into rvc-dev am:...
Merge "Prompt to unlock if player is tapped on lockscreen" into rvc-dev am: 7042dff5 am: 456dc5a0 am: 8b3a34f4 am: a711e828
Change-Id: I030543d784f622f9d0bf9e25b42da7560d545285