Merge "Only stop face auth if display is off & awake" into udc-qpr-dev am: 6f341f9e78

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

Change-Id: I1ba718bcc306a6d377688762b0dfbaff197ded2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>