Merge "Bounds check exposed by fuzzer" am: a60bf718 am: 5252e843 am: 8afc3e16 am: b8f193cc

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



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