Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress when help received" into sc-dev am: a955df6ebc

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

Change-Id: I83d57a6273c05e6f9812ae4abdfc477463656249