Merge "Straighten out NetworkAgentConfig's equals()"