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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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