Merge "CCodecBuffers: fix null buffer PCM conversion" into tm-dev am: 866b66391d am: c653c68195

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

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