Merge "Turn on new class 3 biometric prompt by default on device branch." into...

Merge "Turn on new class 3 biometric prompt by default on device branch." into udc-d1-dev am: 0206a4bd

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



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