Merge "Propogate face/fingerprint authenticate options to detect and authenticate clients." into udc-dev am: deb6c5c0 am: c01aff77

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



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