Merge "Fix race condition in NetworkWatchListTest" am: de39ae42ac am: 59ecc20061 am: 14991f2507

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

Change-Id: I0f6639d68c486ff556ee28b65476cfab2cf61fd6
tree: d56c6fc0f5a4eebda0571c3aa01c3f8780d4b3fa
  1. tests/
  2. Tethering/