Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3

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

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