Merge "Fix issue 5144429: CTS test fails for AudioEffects"