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

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

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