[automerger skipped] Merge "Fix integer overflow in MPEG4Extractor" into tm-mainline-prod am: 6c84b3f8a8 -s ours

am skip reason: Merged-In I792fffb369c5068427c543b63fb1af2013c85918 with SHA-1 0b6094963c is already in history

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

Change-Id: Id27224a23e0897eb43363a94627c07bf1d5ecb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>