[automerger skipped] Merge "Split out the ethernet API surface and use framework-connectivity-t" am: c02e97dcdd am: 580f7ebbce am: c7d06c9e99 -s ours

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

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

Change-Id: Ie81ab5f87a9eb6a99441562101a85c77ef35ccbb