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

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



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