Merge "Trigger face auth on lift, tap and biometric reasons to wake" into...

Merge "Trigger face auth on lift, tap and biometric reasons to wake" into tm-qpr-dev am: 54f1126b am: 7347d3f1

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



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