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

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

Change-Id: I7468c86dc5d7b7a72de0a8d0d7c2fc492ef2eae0