DO NOT MERGE Revert back to old udfps haptics experience am: 6fca2b6cfe

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

Change-Id: Iade3bb87d7dddb3ec237a62de36883e9223bcba7