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

Change-Id: Ibf6f818bf8fc465838f7a430086ccd91562e3923