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

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

Change-Id: I05a02bf1f810d8a85198262f16754095356422de