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

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

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