[automerger skipped] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment am: aee9eaa9de am: 2eb56c2ebc -s ours

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

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

Change-Id: Ieec36f6e2d1f2bde054db2502bbdb27f1fb3be39