[automerger skipped] Merge "Add missing bounds checks" into sc-dev am: 609dd6cb18 -s ours am: 7645ba8528 -s ours am: 4272766d59 -s ours am: 1333e712a4 -s ours

am skip reason: Merged-In Ie3494d592e7b36629317ba51717b528dab13e0fb with SHA-1 2ebfe99b3a is already in history

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

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