Merge "Propogate face unlock always require confirmation setting to biometric...

Merge "Propogate face unlock always require confirmation setting to biometric prompt." into udc-d1-dev am: 27443a9c

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



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