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

Merge changes from topic "aidl_audio_effect_2" am: 89d993d3 am: 2ad819f7 am: 57d87401 am: 1a4b5143 am: 6fc21d49

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



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