[automerger skipped] Merge "Rename StringNetworkSpecifier to Ethernet" am: 1c22944c5e am: 1f5508fb1f -s ours

am skip reason: Change-Id I14c1ac7cee0ec32353b38ebca4ae6c5cd2e25541 with SHA-1 3c3afcd0b7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1574563

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f8f5882f8f817e648722f0f207f6bee35f0727f