Merge "Fix running ConnectivityManagerLegacyTest in any order." am: f9e6392fb9 am: e4cfdbb753 am: 34345ed669

Original change: https://android-review.googlesource.com/c/platform/cts/+/1673506

Change-Id: I105633644d1852f742acc1a9398b61f8816a2d01