Merge "audio: Fix stream cleanup sequence" into main am: a6c2d43c79 am: 3f32ed237a

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

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