Merge "Refactor WifiEnterpriseConfig and move service part in WifiConfigStore"