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

Merge "[automerger skipped] Avoid read out of bounds am: 9d33304e am: e2a8a1e3 am: 726b9eb5 am: 0fc277db am: b2c01cbb am: ba1dcc15 am: 795726df -s ours am: 72642916 -s ours am: 0dd6b4d2 -s ours" into tm-d1-dev-plus-aosp am: 67a38d61 -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: Ia33b7451bab4fe2ecb1084bdf3c789cd03cc0537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>