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

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



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