Merge "Revert "Tap to wake up dreaming for lockscreen hosted dream"" into...

Merge "Revert "Tap to wake up dreaming for lockscreen hosted dream"" into udc-qpr-dev am: 0d129f57 am: dea9534d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24086426



Change-Id: Idc4f759f13b5712459e05d14f749e4f98d8b8952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>