Merge "Add configuration for network capabilities that would be forced marked as cellular transport" into 24D1-dev