Merge "Do not run face detection for bypass when the user is authenticated by...

Merge "Do not run face detection for bypass when the user is authenticated by FP" into tm-qpr-dev am: 6e16fac5 am: 0c2a009d

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



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