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

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

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