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-mr1-dev am: e05b35db
am: 87ec0ef5
Change-Id: Ib6ed82c6e9e48cb7f08cfca194331796c5cdd5ba