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

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

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