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

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

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



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