Merge \"Merge \\\"Disallow shell to mutate always-on vpn when...
Merge \"Merge \\\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\\" into nyc-dev am: 488042fe am: c4ef7669\" into nyc-mr1-dev-plus-aosp
am: 8d309046
Change-Id: I673f011dd476e1825620e1eb1bcdf80f66540d23