Merge "Fix TestNetworkAgentWrapper flakiness" am: 6f41ae928a
am: ad8525b9e4

Change-Id: I281e0f6f4f11c88107d67446fb14d1fa2244ebbb