[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 am: 60488e1d -s ours am: 4b2d8010 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaf0aec05f1e57e64bd172fb17fba469e7f9ec7a5