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

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

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