Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f2430060ba0de9fa4d19fa290b31f114f72b13a
tree: c244c2580589789e002388d6cf72db048acd505f
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING