Fix array-related errorprone warnings am: 1aba0b0461 am: c1da51c9af

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

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