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

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

Change-Id: Ifcbd7a3845695688d56042b6f284c634d135b679
tree: c000494d859c59989aab8a4de51593277feef5e5
  1. tests/
  2. Tethering/