[automerger skipped] Merge "Fix array-related errorprone warnings" am:...

[automerger skipped] Merge "Fix array-related errorprone warnings" am: 1cea8235 am: 09a04d22 am: 910a160e am: 07532ebe am: 58a88a60 -s ours

am skip reason: Merged-In I7fa09707595877f3edd6619ed875020e4e39f263 with SHA-1 43d6c2de is already in history

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



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