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: 64fb7714

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



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