DO NOT MERGE Revert back to old udfps haptics experience

Test: manual
Bug: 202867177
Bug: 209191275
Change-Id: I84277975f8cc80dd085cf22fb30277ce834a41a9
4 files changed