Merge "Avoid deadlock between recognition events and SoundTriggerHwService."