Revert "Audio CAP: Address ANAPIC comments, Part 3 (Split back A..."

Revert submission 3341640-fix-b-364310317-fix-ANAPIC-comments-3

Reason for revert: Droidmonitor created revert due to b/380080376. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3341640-fix-b-364310317-fix-ANAPIC-comments-3

Change-Id: I1a25ed1e1c61170c0f3f6deff335c17b887c4609
11 files changed