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

Change-Id: Ia8b281648ceb9bf0a8424de024c9ae62daed0ae5