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

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



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