Merge "Remove ArrayUtils usage in connectivity classes" am: fb70ef5a24 am: 34b37f0acb am: f6a9b207ee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1aa9f2f95fe1b439891e7d2ecd1a91cc9ed391