Merge "Add isFaceAuthEnabledForUser checks in KeyguardLiftController" am: 37053a5737 am: 9b6cf8fde7

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

Change-Id: I03be8a7588ec54d60adb64b0d04612789fe23f27