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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a8a9582bb1c74dbcb54a5984065e7532839b60a
tree: b75594e46c909be1fe2c2901d6518f292347bf65
  1. staticlibs/