Merge "[Bugfix] Fix array out of bounds." am: 3b45ea7f am: 072daf25 am:...

Merge "[Bugfix] Fix array out of bounds." am: 3b45ea7f am: 072daf25 am: 3ff93cac am: 64439aac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2626020



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