Merge "Fix final UDFPS enrollment haptic" into tm-dev am: da896c6a

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



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