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

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

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