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 am: 018e957f

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



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