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

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

Change-Id: I81b18b9117f929e3f6d3387c982cf1dc5b83acd3