Merge "Revert "Audio CAP: Address ANAPIC comments, Part 3."" into main