[automerger skipped] Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a93f am: f3c5806f9f am: 3837cf62e4 -s ours am: fd11e62086 -s ours

am skip reason: Merged-In Ie8d6792ff391d36d0e199a1d7f649e6081c1e8ac with SHA-1 cc538ed268 is already in history

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

Change-Id: I35bdf475d02923d598b37049df4ca3c661efba2d