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

[automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413 -s ours am: d390efcd -s ours am: 402512fd -s ours

am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332

Change-Id: I325a07a6647684384bd3326746e4d351c22c4c61