[automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c -s ours

am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a is already in history

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



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