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 am: 1d38e87e

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



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