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

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



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