Merge "Fix SoundTriggerMiddleware deadlock issues" into rvc-dev am: 9faccb669e

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

Change-Id: I2e3443868c862559fc4d263156f48bd28cc516c0