Merge "CCodec: fix wrapping logic" am: d4c493df am: 72c93f5f am: 38c98dd6 am: 44a98a18

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



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