Avoid read out of bounds am: 9d33304e am: e2a8a1e3 am: 726b9eb5 am:...

Avoid read out of bounds am: 9d33304e am: e2a8a1e3 am: 726b9eb5 am: 0fc277db am: b2c01cbb am: a8ab3184 am: d55ded1b am: 41e77146

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



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