Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user...
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am: 488042fe
am: 07e11c3a
Change-Id: If1ff799f4c515b84dbb8cb4fa6f06f747f78bf67