[automerger skipped] audio: Fix stream cleanup sequence am: 01df7e8c2d -s ours am: 03650f8d12 -s ours am: f7d738da53 -s ours

am skip reason: Merged-In Ie86f682af202976ed48d24338b2dffcfd20d9a76 with SHA-1 0413d077f7 is already in history

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

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