Merge changes from topic "aidl_audio_effect_2" am: 89d993d3 am: 2ad819f7 am: 57d87401

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



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