[automerger skipped] Add Ethernet, TestNetworkSpecifier API am: 65949518fa am: cd075295ae am: 71bd83fe19 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4f60a26f8c19e77d348dfcc7c382022ba6cf0d1
tree: 4e310235937c2eb42e24292dbd7c06dad3d41cd7
  1. core/
  2. services/