Merge "Effect AIDL: Add back some effect parameters." am: 903e6d8264 am: d790e74f1e am: 55c3104a28

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

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