[automerger skipped] Merge "Correct crop size for av1 software encoder" into...

[automerger skipped] Merge "Correct crop size for av1 software encoder" into udc-dev am: 84f6e4a4 am: 50b3c725 -s ours am: df058162 -s ours am: 19a54e06 -s ours

am skip reason: Merged-In I4631eb48f59fce19af4de0fb2be2ca0ec80ae8ae with SHA-1 0ed520ba is already in history

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



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