Merge "Haptic Generator : Modify HapticScale param to be a list" am: fb6e7a8fb2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2366829

Change-Id: Ie3a4853e1c11eae5fcb2812d9c0998910eefc645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>