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

Merge "Respect "power button instantly locks" setting for dream behavior." into tm-qpr-dev am: bccceec3

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



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