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

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

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