Merge "Move NetIdManager, ProfileNetworkPreferences"