Merge changes from topic "aidl_audio_effect_6" am: 6acc2e59 am: 317b28bf am: 6021bf58

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



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