Merge "Remove ConnectivityManager from EnterprisePrivacyFeatureProvider." into sc-dev