Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3 am: d2575f7332 am: 89dce2f2ea

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

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