[automerger skipped] Merge "Immediately stop running face auth if the display...

[automerger skipped] Merge "Immediately stop running face auth if the display is OFF" into udc-d1-dev am: 42f90671 -s ours am: f81672b6 -s ours am: 2505dc5c -s ours

am skip reason: Merged-In Ie68db6a998fdff1c8b2b79d75650f999bcc55c13 with SHA-1 4ecdf4c3 is already in history

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



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