Merge "libaudiohal@aidl: Fix deadlock when stream goes away" into main am:...

Merge "libaudiohal@aidl: Fix deadlock when stream goes away" into main am: eb470e9f am: 40bf29e6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3228909



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