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: 4b6ba436 am: a66a9e9c

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



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