Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: bbbca8b27f

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

Change-Id: I75e8a966bb73a29461f0a3054918e30e1044ea8c