Merge "WifiEnterpriseConfig - Stop depending on constants from android.security.Credentials"