Merge "Merge "codec2: fix output delay update" into qt-dev am: 9368cad390 am: 19216177c6" into qt-r1-dev-plus-aosp