[automerger skipped] Avoid read out of bounds am: 9d33304ec7 am: e2a8a1e317 am: 726b9eb55c am: 0fc277dbb3 am: b2c01cbbc6 am: ba1dcc1577 am: 795726dfd9 -s ours

am skip reason: Merged-In Ieca5a5390d3cf73fff6aa552d065363d84e1ccc2 with SHA-1 9d33304ec7 is already in history

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

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