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

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



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