Merge "Do not ignore lockout error from face if it's class3." into udc-dev am:...

Merge "Do not ignore lockout error from face if it's class3." into udc-dev am: 022e333a am: d44c9cec

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



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