[automerger skipped] Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress...

[automerger skipped] Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress when help received" into sc-dev am: a955df6e -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/+/15780233

Change-Id: I30a151c5ecc5f011c1e4905fa392f23b01dc86d5