[automerger skipped] Merge "DO NOT MERGE Revert back to old udfps haptics...

[automerger skipped] Merge "DO NOT MERGE Revert back to old udfps haptics experience" into sc-v2-dev am: 23bedb26 am: 9a021b80 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I743feee22b01d57a4cdabb0f5638292a768354aa