Merge "Fix potential null dereference in SoundTriggerHwService"