Merge "audio: Address comments from an internal review" into main am: 09d45c473e am: 581cd68e17

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

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