Merge "Revert "connectivity_native_test: remove retries"" am: 749fd994f8 am: 8d48c6156b am: 3ca526ccf8

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

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