Merge "Delay awaken from Dream to avoid wallpaper flickering." into tm-qpr-dev am: ec576c7a

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



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