Merge "Added lockout callback to FaceAuthenticationClient" into sc-v2-dev am: c2993b2445

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

Change-Id: I69026bec8185d59736070b8fc71cffc8359eef3a