Merge "Deflake test to ensure system default network as expected" am: 575fa2f103 am: 250cf2af8a am: c79dce9599

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

Change-Id: I62c4b92e83c5f87e7f53ab2db0c88e9aed3ab859