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: Ib01729da70d7c1856bd9cc42adf4057643eee566