Merge "Wakeup display on taps before entering true AoD" into tm-qpr-dev am: 88deb417

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



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