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 am: 38504f85

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



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