Merge "Fix race condition in NetworkWatchListTest" am: de39ae42ac

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

Change-Id: I14fa977efaf51d591409a8a4c2c547bba7d8bed1