[automerger skipped] Merge "Rename StringNetworkSpecifier to Ethernet" am: ce2ab07074 am: 0594e93b46 am: a88f2b694e -s ours

am skip reason: Change-Id Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf with SHA-1 dd128f6ea3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I845c97360365cc407bd673313177738974cf6114