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