[automerger skipped] Merge "Prevent out-of-bounds read" into sc-dev am:...

[automerger skipped] Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a9 am: f3c5806f am: 3837cf62 -s ours

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

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

Change-Id: Idd0eba166918f528ad7c8ec5823e9159a65b5a47