Merge "Remove hidden ArrayUtils usage in test" am: 946da61e70

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760689

Change-Id: If2a051f415f46544955e6646ed7d74c52d4e2d22