Merge "Locking screen after timeout to dream" into udc-dev am: 2fad91a2

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



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