Merge "Revert "Tap to wake up dreaming for lockscreen hosted dream"" into udc-qpr-dev