Merge "Correct crop size for av1 software encoder" into udc-dev am: 84f6e4a4 am: 13d9f503

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



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