Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073

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

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