[automerger skipped] Merge "Locking screen after timeout to dream" into...

[automerger skipped] Merge "Locking screen after timeout to dream" into udc-dev am: 2fad91a2 am: a2617c3e -s ours

am skip reason: Merged-In I977529aca13dd94f8458136c366279918c02a987 with SHA-1 fda25250 is already in history

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



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