Merge "Update UDFPS haptics take #1" into sc-v2-dev am: 33ed50d7bb am: 0ea740e376

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

Change-Id: If63595357a439f344f5e237dbf02668b622c4cca