Merge "Fix deadlock in SoundTriggerService using intent API."