Merge "CCodec: fix wrapping logic" am: d4c493dfd6 am: 72c93f5f96

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

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