Merge "Fix deadlock between audio policy manager and sound trigger m/w" into rvc-dev