Merge "Use SystemUI config to easily adjust udfps haptics" into sc-v2-dev am: c546f6e01a am: c13ab099d6

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

Change-Id: I85bc722d5c34a2693a62813b3abbbb980861efbf