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

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

Change-Id: I82d32567a3b2e49453f8400fc867222a130bbe44