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

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

Change-Id: Idb4665dcf48c78fe273d6bf2764a500ad141f270