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

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

Change-Id: I8aba5bd729d98b374769efde7f062480f6f295b3