[automerger skipped] Merge "Codec2BufferUtils: Use cropped dimensions in RGB to YUV conversion" into sc-dev am: 3db9e2edba am: 2fc441a80c am: d8f5f20572 am: 84085efe13 am: 9a15d010ef am: 108ea2cfd7 -s ours am: b3f9f90d0b -s ours am: 12568a4f82 -s ours am: 9bc4a46204 -s ours am: e0e09bef1d -s ours

am skip reason: Merged-In I42c71616c9d50f61c92f461f6a91f5addb1d724a with SHA-1 3ee0378ac5 is already in history

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

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