[automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment"...

[automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: bbbca8b2 am: 61bc143b -s ours am: af2f0d7c -s ours

am skip reason: Merged-In I6f6111ab0ed29ca7f1be01303f0457764d5afe01 with SHA-1 cc50932c is already in history

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

Change-Id: I362bd0530a97d30a25d0f1d216773448f8691f85