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: 89c1d943 am: 233628bb am: 8803f840
Change-Id: Ib72e4978d90bfb8c45e437e3f22ecac816f45bbc