[automerger skipped] Merge "Turn on device when finger down" into tm-qpr-dev...

[automerger skipped] Merge "Turn on device when finger down" into tm-qpr-dev am: 47c2c4b2 am: d1281b63 -s ours

am skip reason: Merged-In I486d54e30a98b9e89d26744ddf45ebe9453b8743 with SHA-1 0a50b57e is already in history

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



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