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

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

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