Merge "Fix array-related errorprone warnings" am: f1d9a67025

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2184826

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