[automerger skipped] audio: Address comments from an internal review am: aa449835 -s ours

am skip reason: Merged-In I2f636c77f67fdd8eeac70dd304848bf7f76db4e5 with SHA-1 0faf3394 is already in history

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



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