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

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

Change-Id: I929368486d350bbb3aafa535dcc6f74aee2f7e90