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

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

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