Merge "Respect "power button instantly locks" setting for dream behavior."...

Merge "Respect "power button instantly locks" setting for dream behavior." into udc-dev am: ebbdade9

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



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