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

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

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



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