Merge "Stop PCM streams before attempting to close them" into main am: db53d0a560 am: b07d377106

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

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