Merge "Solve the problem of array out of bounds" into main am: ece7fe5bb7

Original change: https://android-review.googlesource.com/c/platform/system/media/+/2853108

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