Merge "[automerger skipped] Merge "Add missing bounds checks" into sc-dev am:...

Merge "[automerger skipped] Merge "Add missing bounds checks" into sc-dev am: 609dd6cb -s ours am: dfde9f06 -s ours am: d5e769b6 -s ours am: 43c4d3b0 -s ours" into tm-d1-dev-plus-aosp am: 58e84c35 -s ours

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

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



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