Merge "Fix array-related errorprone warnings" am: 5de75c7d

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2185064



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