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

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

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