Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev