Merge "Prevent face auth from running again after a successful unlock when...

Merge "Prevent face auth from running again after a successful unlock when assistant is active." into tm-qpr-dev am: 7d6c291d

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



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