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