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

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



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