Merge "Haptic Generator : Add libeffect implementation" am: e1f6e9ce9e am: e7326c0b39

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

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