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

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

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