Merge "Do not delay bouncer for running face auth if face unlock is locked...

Merge "Do not delay bouncer for running face auth if face unlock is locked out." into tm-qpr-dev am: fcbb9f98

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



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