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: I54dd4ee11a983fef1a834a5eb1a9b04e75f3e41b