Merge "Switch to using the NetworkAgentConfig.Builder API."