Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a93f am: f3c5806f9f

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

Change-Id: Ibca0c047fd584a725a05f5856498e526f64eb746