Merge "Fix to resolve CTS test case testDecodeUsacDrcEffectTypeM4a" into pi-dev