Merge "Support configurable multi-stage UDFPS enrollment" into sc-v2-dev am: 8f8783ca1b

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

Change-Id: I2a05114500ec35d26f02ddd0039ff47f0f76710f