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

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3328569

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