Merge "Fix SoundTriggerMiddleware deadlock issues" into rvc-dev am: 9faccb669e am: 3845dc850a am: db4e32f245 am: b63d3f889a

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

Change-Id: I1cbe9c288ffb0d143e4216c39f1096bf5333d89a