Merge "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS"" into main