[automerger skipped] Merge "CCodecBuffers: fix null buffer PCM conversion" am:...

[automerger skipped] Merge "CCodecBuffers: fix null buffer PCM conversion" am: 2314d60f am: df4a9eee -s ours am: f64e5416 -s ours

am skip reason: Merged-In I8503132a779aae6bc652ea030d29fc466c8a31a9 with SHA-1 360ba0a4 is already in history

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



Change-Id: Ide3ae60e06cd4577db024dac6acf78a2cc627b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>