[automerger skipped] Merge "Split out the ethernet API surface and use...

[automerger skipped] Merge "Split out the ethernet API surface and use framework-connectivity-t" am: c02e97dc am: 580f7ebb am: c7d06c9e -s ours am: dda94955 -s ours

am skip reason: Merged-In I1956848d3248cc56e9841d221e5e4c160bed65a4 with SHA-1 218c4d31 is already in history

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

Change-Id: I57807b9fc5755f09253e5774b564a4a436a63d37