[automerger skipped] Fix udfps fingerprint setting flow am: d3a1f700 am: 7856ab05 -s ours

am skip reason: Merged-In I62d945f2c2e980edf2a885234e54acae109e7672 with SHA-1 936dd313 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732077



Change-Id: I25caed3661bb7516392600e4526fcc22e5959ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>