[automerger skipped] Merge "Merge EthernetServiceTests into FrameworksNetTests" am: 82ef475266 -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: I4907a1d2adb036ccbd72c84c2af23d23f51d4925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>