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: c3407d9c am: c4044be5

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



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