Merge "CCodec: fix update pixelFormatInfo for pre-S" am: b99b4cf29c am: 1151839382

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

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