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

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

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