[automerger skipped] Merge "RESTRICT AUTOMERGE Support UDFPS multi-stage...

[automerger skipped] Merge "RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment" into sc-dev am: b4a1d572 -s ours am: 34b3820f -s ours

am skip reason: Merged-In Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd with SHA-1 3edacaab is already in history

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

Change-Id: I6ad36a04843744209d6e9aa3ffebf5b4bcc378cc