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

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

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

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