Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Support UDFPS...

Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment" into sc-dev am: b4a1d572 -s ours am: 34b3820f -s ours am: 67fad1ca -s ours" into sc-v2-dev-plus-aosp am: 8486b0c5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4434d137c11f94fd4ec0a45d6d27c2f29d906a59