[automerger skipped] Add Ethernet, TestNetworkSpecifier API am: c5479a08 am:...

[automerger skipped] Add Ethernet, TestNetworkSpecifier API am: c5479a08 am: c792424c am: 734c56f7 -s ours am: 105a6940 -s ours

am skip reason: Change-Id Iee569f5c8bbdc4bc979610e1191308281f3d4620 with SHA-1 6d981570 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c5aec0b1a6569ccee0842ca3b63d701666938b3