Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c

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



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