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 am: 053d63c0

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



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