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

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

Change-Id: I42b5edbc64e54e8c7c58aa7f85e681729613e20d