Merge "Check for non-interactive dreams when wake and unlocking." into udc-dev am: dcfa48821c

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

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