DO NOT MERGE Revert udfps haptics updates Test: manual Bug: 202867177 Bug: 209191275 Change-Id: I5b1341e6e34f5b1e0b7f456a61ce4d7928a16b8c