Merge "Improve testOpenConnection() reliability with fallback IPv6 check" into main am: 742a8120ff am: b90075120c

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

Change-Id: I636a6359f92312cc344bd6ace8769e7f8ce6c5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>