Merge "Enable HapticGenerator AIDL effect" into 24D1-dev