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

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

Change-Id: I37b8484f89012d84137e2ec2e165aada7f299e5e