[automerger skipped] Merge "RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment" into sc-dev am: b4a1d57267 am: 7b099eaf18 -s ours am: 6487f0961a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I95bfd0451331004ca94c2f7c797b474c5e8886b5