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

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



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