Merge "audio: Make renamings suggested by reviewers" into main am: e8d695d9 am: d621a32f

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



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