[automerger skipped] Merge "mpeg4enc: fix OOB in RasterIntraUpdate" into mainline-prod am: 388c0389 -s ours

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

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

Change-Id: I382a79df968468607469d86ecd3999235c3a1ed0