Merge "Make AAC decoder behavior after flush consistent with non-flush"