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

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

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



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