Merge "make ACTION_NETWORK_SETTINGS_RESET to be system API"