Merge "Fix EtherentTetheringTest flaky" into main am: 013425e27e am: 20e1f92aac

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

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