Merge "Fix TestNetworkAgentWrapper flakiness"
am: 6f41ae928a

Change-Id: I7a20018464b1df7399fd093d2b3259aeb0bca194