Merge "Prevent race in NetworkMonitorTest" into rvc-dev am: 6d0b54800f am: b2a00f1204

Original change: undetermined

Change-Id: Ie0f512d0c17788549b7e06b134048ccce2196ff0