[automerger skipped] Merge "Merge EthernetServiceTests into FrameworksNetTests" am: 82ef475266 am: 619ff9a9fd am: fb7ea380e2 -s ours am: bde0ce0fb5 -s ours am: a54318e287 -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: Id4b497ea8480769fb4236f194845e2f22824da77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>