Merge "Revert "connectivity_native_test: remove retries"" am: 749fd994f8 am: 89abf99fc3

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

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