Merge "Revert "Stop running face detection on bouncer if both face and fp are...

Merge "Revert "Stop running face detection on bouncer if both face and fp are enrolled."" into tm-qpr-dev am: 4b73f2a5 am: 79a0ec19

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



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