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: Iaef23446e43ef557521785a23e5dcf81655d7f05
tree: 3117a708f9dba4336ba0ead260c0f38568a5f081
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING