tree cd72e3fa06b2c7d53fe4615e4fc7fd0575b11804
parent c6551d73b79c8a9e15fda22abf2c07315dccc873
parent a474b9edfa75267274cec0d742ce2b567ccd3158
author Remi NGUYEN VAN <reminv@google.com> 1614333750 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614333750 +0000

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