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

Merge "[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" into sc-v2-dev-plus-aosp am: fbe83542 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3fe95d81b8ac714bcd2c9771eb7c8c8f47c6796c