Merge "Ignore power presses from lift and biometric wake" into tm-qpr-dev am:...

Merge "Ignore power presses from lift and biometric wake" into tm-qpr-dev am: c956023f am: 160d1747

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



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