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

Merge "Stop running face detection on bouncer if both face and fp are enrolled." into tm-qpr-dev am: 18640ab7 am: 6ba0b42c

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



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