Merge "Add a feature flag for the udfps keyguard view refactor" into udc-dev...

Merge "Add a feature flag for the udfps keyguard view refactor" into udc-dev am: 9dcad8dd am: 5e816261

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



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