Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3 am: d2575f7332 am: 89dce2f2ea am: 546ce87c95 am: 36117a1587

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

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