Merge "Better fix for race condition in SoundTriggerHw2Enforcer" into sc-dev