[automerger skipped] Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress when help received" into sc-dev am: a955df6e am: 1c29dc10 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If3fa130eb26d41394ef69fd25dc60de663bcb35c