tree e3f465c3f417495b444992878cc29eed5a94bcd5
parent d3843963b0e0618d87b1ddef72740636babf7c36
parent 9b6cf8fde7cd772a504772237c24aea196fb0fbe
author Treehugger Robot <treehugger-gerrit@google.com> 1596082485 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596082485 +0000

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

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

Change-Id: I03be8a7588ec54d60adb64b0d04612789fe23f27