Merge "Fix SoundTriggerMiddleware deadlock issues" into rvc-dev am: 9faccb669e am: 251826e5d1 am: 2481bd79ff

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

Change-Id: I6cc2ddae608f8fff1e4bd0cf19ffc84f1bb43228