[automerger skipped] Merge "Prevent race in NetworkMonitorTest" into rvc-dev...

[automerger skipped] Merge "Prevent race in NetworkMonitorTest" into rvc-dev am: 6d0b5480 am: b2a00f12 am: f72cb2a3 -s ours

am skip reason: Change-Id I764a97b1007613e7d1c19ec6294faac27bea1fef with SHA-1 7fb8da73 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11629115

Change-Id: Ie4a9e5086848dc24e5dea11da88207aed2226b9a