Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main am: 47158c98b5 am: b41a17a4f4 am: d412e5cb56 am: e68739d975 am: fd1ed62f81

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

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