Merge "Fix race condition in SoundTriggerHw2Enforcer"