Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main am: 47158c98b5 am: ec52b7baaa

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

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