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

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



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