Fix a race condition in upstream selection. am: 491999292b am: bf8a7b622d

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

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