Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a9 am: f3c5806f am: b50bdd80

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

Change-Id: Idd204d5e6fddd988672d473f4fc2150133888f1e