Merge "CCodec: Fix null check" am: 77a7eeff17 am: def290614b am: 1cefed77ab am: b77b357586

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

Change-Id: Ifc192a43d197f31872869be95eab5cf0fc3d3772