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

[automerger skipped] Merge "Fix final UDFPS enrollment haptic" into tm-dev am: da896c6a -s ours am: efe23af6 -s ours am: 7d35d605 -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: I5ee421e1daac119f78881633c686905b884a9780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>