[automerger skipped] Merge "Do not go to dream on power button press when...

[automerger skipped] Merge "Do not go to dream on power button press when screen is off." into tm-qpr-dev am: 20e330dc am: 5e3e0d62 -s ours

am skip reason: Merged-In I25bb8bc5b720fd6cc1b1ac9219c8c94eecf8232a with SHA-1 f37ffbac is already in history

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



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