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

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



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