[automerger skipped] Merge EthernetServiceTests into FrameworksNetTests am: 40da62da48 -s ours am: 198ba0cda3 -s ours

am skip reason: Merged-In Id533cdb4ac184b963f570af299dea04754ba88e9 with SHA-1 6ad9287432 is already in history

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

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