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

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

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