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

[automerger skipped] Merge "m4v_h263: Add check on the encode dimension" into rvc-qpr-dev am: 1c03d6e0 -s ours am: 60d17c50 -s ours am: c3a50256 -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/+/13248479

Change-Id: I1756f88081d0f5f5a166ec81cc6fb2ebc66e9de3