Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa am: af4b10e326

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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