Merge "Rename APIs in NetworkAgentConfig.Builder"