[automerger skipped] Merge "m4v_h263: Add check on the encode dimension" into...

[automerger skipped] Merge "m4v_h263: Add check on the encode dimension" into mainline-prod am: 818dbf73 -s ours am: bbbb2dd2 -s ours

am skip reason: skip tag Change-Id Id32ee0585a4188f3b303d7f2f83793d7ab8152da with SHA-1 4e70ae10 is already in history

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

Change-Id: I8dc4817d54486cbfbc6058e65dc590f7d630327e