Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f

Change-Id: I9dd5d6641307589250d781dce11c4f2186b3c8fb