Merge "DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig"" into rvc-qpr-dev