[automerger skipped] Merge "Respect "power button instantly locks" setting for dream behavior." into tm-qpr-dev am: bccceec33c am: 07e01c6e5c -s ours
am skip reason: Merged-In I991504805c534eb76269579a2e753318fe0f1811 with SHA-1 533aade95f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21383587
Change-Id: I0759eab2f0b7cf1b4d8f8dc23864bda77d6490d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: