Merge "Fix screen getting relocked after unlocking once and wallpaper dream...

Merge "Fix screen getting relocked after unlocking once and wallpaper dream has stopped" into udc-qpr-dev am: b7186d7c

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



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