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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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