Merge "Fix array-related errorprone warnings" am: 9ed2177318 am: 425c5c90dd am: 4deb8e8f87 am: 3007c94acd

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

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