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

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



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