Merge "audio: Cleanups and refactorings" am: e503e08107

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

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