[automerger skipped] Merge "Respect "power button instantly locks" setting for...

[automerger skipped] Merge "Respect "power button instantly locks" setting for dream behavior." into tm-qpr-dev am: bccceec3 am: 07e01c6e -s ours am: 57971959 -s ours

am skip reason: Merged-In I991504805c534eb76269579a2e753318fe0f1811 with SHA-1 533aade9 is already in history

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



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