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

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



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