Merge "Revert^2 "Audio CAP: Address ANAPIC comments, Part 3."" into main am: 2e6ae4f390 Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/3369045 Change-Id: I9bdd179bf5b631f3dac01b5b8dcddaab841f8339 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>