Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af am: 5d9a564880 am: 87e54599d3

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

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