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: 9937b98f

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



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