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

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



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