Merge "Do not go to dream on power button press when screen is off." into tm-qpr-dev am: 20e330dc

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



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