Merge "audio: Fix stream cleanup sequence" into main am: a6c2d43c

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



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