Merge "Add configuration for network capabilities that would be forced marked as cellular transport " into main