[automerger skipped] Merge changes from topic "aidl_audio_effect3" am:...

[automerger skipped] Merge changes from topic "aidl_audio_effect3" am: bc71b029 am: d8d1f859 am: 31ac8f3d -s ours am: 9cd04ff3 -s ours

am skip reason: Merged-In If8000b7396360996bdfb8eb269bc3de543871673 with SHA-1 3c237d76 is already in history

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



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