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: Ib9b4b8fae53faccd88afa36977f398ce92d2be2a