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

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

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



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