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

Merge "[automerger skipped] Fix heap-buffer-overflow in MPEG4Extractor am: d13a4efc am: 3c5de138 am: 35d835f9 am: 65ce2a89 am: 1f734b0f -s ours am: 1aa2abf9 -s ours am: 0448f677 -s ours" into sc-qpr1-dev-plus-aosp am: ae82f68d -s ours

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

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

Change-Id: I7469b732bc3eb4673c5cfda9a023db8b93841552