Merge "EthernetTetheringTest: test testTetherClatTcp on S+ device" am: 75a819d9ff am: 51a44d2882

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

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