Revert^2 "Audio CAP: Address ANAPIC comments, Part 3." am: 155d7bc698 am: 4d8a5116a7

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3369042

Change-Id: I0005e673b9f2e934b908e8d510491ba14eae4870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>