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

Merge "Tap to wake up dreaming for lockscreen hosted dream" into udc-qpr-dev am: 069b9616 am: 9621b5e2

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



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