Merge "Separate test into reasonable multiple tests" am: 26a7e61417 am: 33076dddff am: 8ede56f676

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

Change-Id: I17df1eb88c6ee4637e016c915559fbc6518be4e6