[automerger skipped] Merge "mpeg4enc: fix OOB in RasterIntraUpdate" into...

[automerger skipped] Merge "mpeg4enc: fix OOB in RasterIntraUpdate" into rvc-qpr-dev am: 7f822771 -s ours am: 7e2a28f7 -s ours

am skip reason: skip tag Change-Id Id6cf902cb7b386760d5f641f05e99ece91621ec5 with SHA-1 8460ab7b is already in history

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

Change-Id: I73037e12cf27a57ccabab04ca5f2cb9f8e895682