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

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



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