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

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

Change-Id: I611223c4a2cb5789e73148756c3c8a3c797bea5d