Merge "Audio CAP: Address ANAPIC comments, Part 2." into main am: c6eec055ed

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

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