Merge "Add a hack that ensures face auth failed message is not shown after...

Merge "Add a hack that ensures face auth failed message is not shown after face lockout" into udc-dev am: 963c0749 am: 4c19d9cf

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



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