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

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

Change-Id: I745703fb0e3207c5ccb035fe3976f3d9847ac700