[automerger skipped] Merge "Prevent race in NetworkMonitorTest" into rvc-dev...
[automerger skipped] Merge "Prevent race in NetworkMonitorTest" into rvc-dev am: 6d0b5480 am: b2a00f12 -s ours
am skip reason: Change-Id I764a97b1007613e7d1c19ec6294faac27bea1fef with SHA-1 57218af3 is in history
Original change: undetermined
Change-Id: I541610647d8a0effd37373d107deb3278ea51a60