Merge "Fix array-related errorprone warnings" am: 1cea8235 am: 09a04d22

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



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