Merge branch '5msAPI-with-default_20ms' of...

Merge branch '5msAPI-with-default_20ms' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 5msAPI-with-default_20ms