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

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

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