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

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

Change-Id: Iaafa4eb81d66f2d9e72bf4bf053cbe041402b93a