[automerger skipped] Merge "Fix flakes in tests running after testIsPrivateDnsBroken" into sc-dev am: 64168015f1 -s ours

am skip reason: Merged-In Id9beba94e0fed85bd26c0509ad61369be794f3c3 with SHA-1 582770ce68 is already in history

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

Change-Id: Ic7c46d121b83eb531a8870a93f071bb1d0d1fcfb