Merge "Haptic Generator : Modify HapticScale param to be a list" am: 92a771e454 am: 0f52b1144e am: ace86038c0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2366809

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