Merge "Effect AIDL: Add back some effect parameters." am: 2e6d62fcb3 am: 70dad29d89 am: c49e0931c8

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

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