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

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



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