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

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



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