Merge "Move TestableNetworkAgent to Common Util Location"