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

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

Change-Id: Idc2018bff9b1a2ce89aaba02260db6dcaf5dfa0e