[automerger skipped] Merge "Only stop face auth if display is off & awake"...

[automerger skipped] Merge "Only stop face auth if display is off & awake" into udc-qpr-dev am: 6f341f9e am: 8690289f -s ours

am skip reason: Merged-In Ib58b6f311298d4d0c97c548565f0f046df3f8349 with SHA-1 9e24f4a3 is already in history

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



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