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

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

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