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 am: d1cc5814 am: 2d55de80

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



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