[automerger skipped] Merge "Avoid read out of bounds am: 9d33304e am:...

[automerger skipped] Merge "Avoid read out of bounds am: 9d33304e am: e2a8a1e3 am: 726b9eb5 am: 0fc277db am: b2c01cbb am: a8ab3184 am: d55ded1b am: c4bed32e" into tm-d1-dev-plus-aosp am: 0d861a69 -s ours

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

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



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