[automerger skipped] Merge "Fix heap-buffer-overflow in MPEG4Extractor" into...

[automerger skipped] Merge "Fix heap-buffer-overflow in MPEG4Extractor" into sc-dev am: 031ae61d am: 7b7e1d7f am: 8c824b81 -s ours am: cbda3f1c -s ours

am skip reason: Merged-In I31f2b9a4f1b561c4466c76ea2af8dd532622102a with SHA-1 1d5c36d8 is already in history

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

Change-Id: I3dcbb7b0b3bdfff07ff46ab02404e9cf6940f30a