[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: 937a122b -s ours am: 632440eb -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iab26c4a4e4382e414c862736b6147e930dfd4c7e