Merge "Add flag for refactoring biometric prompt and adding new class 3...

Merge "Add flag for refactoring biometric prompt and adding new class 3 features." into udc-dev am: 65222873 am: fd8f3130 am: 958b0cd2

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



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