Merge "Merge "Revert "Finish FaceAuthClient onLockout"" into udc-qpr-dev am:...

Merge "Merge "Revert "Finish FaceAuthClient onLockout"" into udc-qpr-dev am: 5a961b8a" into udc-qpr-dev-plus-aosp am: 96a6eb59

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



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