Avoid read out of bounds am: 9d33304ec7 am: e2a8a1e317 am: 726b9eb55c

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

Change-Id: I1dc3a7324859e8809d8555dc4d375f477a7017bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>