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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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