Merge "audio: Address comments from an internal review" into main am:...

Merge "audio: Address comments from an internal review" into main am: 09d45c47 am: 581cd68e am: ca31f56b am: 3dbe932f

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



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