[automerger skipped] Merge "Check for non-interactive dreams when wake and...

[automerger skipped] Merge "Check for non-interactive dreams when wake and unlocking." into udc-dev am: dcfa4882 am: ebd1e3e8 -s ours

am skip reason: Merged-In Iaffbb53b29578c0575a7737c8aacdc8ca547b426 with SHA-1 6aeb1399 is already in history

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



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