Merge "Settings: add ACTION_NETWORK_PROVIDER_SETTINGS" into main