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 am: 7f99d8a9

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



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