Merge "prevent preempting overlapping sound trigger audio streams" into oc-dr1-dev