[automerger skipped] Merge "libaudiohal@aidl: Implement effects...

[automerger skipped] Merge "libaudiohal@aidl: Implement effects adding/removal" into udc-qpr-dev am: 4198ba0c -s ours am: 7d62ea63 -s ours

am skip reason: Merged-In Ibb6d58222568057423579a05e0dca2b148f101f0 with SHA-1 a82a69d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23732477



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