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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81598d1711afbb2342c5da42a992a32252d990fa