Merge "CCodec: convert audio decoder output PCM format" am: c9c9611837 am: 470bf863ca

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1836393

Change-Id: Id56a382fdb224aa5f41283a627c54184df953395