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

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

Change-Id: Id4c1d5d588df81890096bd45f686c34ef172cfad