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

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



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