[automerger skipped] DO NOT MERGE Revert back to old udfps haptics experience am: 6fca2b6cfe am: eedfff5afb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I360672a25cf9e6d5a8bfad2499ac2eed426f7740