Merge "Fix array-related errorprone warnings" am: f1d9a67025 am: 942b9328dc am: 17e54cf2be

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2184826

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