[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: 6afcf914 -s ours am: 7859bf9e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id8677e5b386788203e243e01cb79d8e55b1231e4