Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8

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

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