Merge "Add isFaceAuthEnabledForUser checks in KeyguardLiftController"