Merge "Separate test into reasonable multiple tests" am: 26a7e61417 am: 33076dddff am: 39e361c9b4

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

Change-Id: Id2ef65dfb0bf841eaf6307b220d187ccb88478ff