Merge "audio: Make renamings suggested by reviewers" into main am: e8d695d9b2 am: d621a32f12 am: ba5b434808 am: d4ad23c40b am: c0da9ae1a1

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>