[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: 33208556 -s ours am: efb2bb89 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3213787f177ffe541118e5a67faba80dcf3d9324