Merge "Fix array-related errorprone warnings" am: a93e78f7 am: a89e7aea...

Merge "Fix array-related errorprone warnings" am: a93e78f7 am: a89e7aea am: cdacabf9 am: 49a0bbc6 am: ac7a368a

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972



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