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
am: 0e06694e
Change-Id: I3a43e63966f48964af9a9a53fb33de7a995a21d8