Merge "Tap to wake up dreaming for lockscreen hosted dream" into udc-qpr-dev am: 268ce75f

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



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