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

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

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