[automerger skipped] Merge "Making EthernetNetworkSpecifier public" am: d13094ce am: ac80eedc am: e33c5bc4 am: e3544f74 -s ours

am skip reason: Merged-In Ic0b7a3360745632eb024a97692e49f6c8dafa3ee with SHA-1 4c958ed5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971181

Change-Id: I6dbdea659164e25ee1e17f9b1f63dfe9d10ae698