[automerger skipped] Fix final UDFPS enrollment haptic am: 3e5919a6 -s ours am: 8288ae8e -s ours am: 773471a9 -s ours

am skip reason: Merged-In I2afe26c1d750ca4fff6dd3635e2c4f68a6d037d6 with SHA-1 ca4a360c is already in history

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



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