Merge "Do not run face auth if face is locked out and don't transition to...

Merge "Do not run face auth if face is locked out and don't transition to bouncer when face is locked out." into tm-qpr-dev am: b3b9a1d0

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



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