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

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

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