Merge "Fix array-related errorprone warnings" am: 9ed2177318 am: 425c5c90dd

Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2185067

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