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

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

Change-Id: I4bb35590047d85fcc9d932af0fa0383b66e0cc9a