Merge "codec2: Fix VideoEncoderRoiTest cts failure" into main am: 6807a5fefc

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

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