[automerger skipped] Merge "Fix final UDFPS enrollment haptic" into tm-dev am: da896c6a7d am: 96099ad645 -s ours am: 561fc406fc -s ours
am skip reason: Merged-In I2afe26c1d750ca4fff6dd3635e2c4f68a6d037d6 with SHA-1 ca4a360c5d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083245
Change-Id: I5d4ab496c4da4cd14a4d1c478428d56ed558e38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: