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: c4ef7669
Change-Id: I475fad882d4fb67e3af813b3a2a2548dae760c16