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

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

Change-Id: Iefb72eea33105624e728096735ee13a73d039a84