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

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



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