Merge "audio: fix race when stopping a stream" into sc-dev am: 84165ed1 am:...

Merge "audio: fix race when stopping a stream" into sc-dev am: 84165ed1 am: 5e9d4a5d am: 84a4276f

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

Change-Id: I2bbd61108673a18ca4f7c807d300b50b597d6027