Merge "WifiEnterpriseConfig: Refactor set/get field values"