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

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



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