Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am: 488042fe3b
Change-Id: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f
This commit is contained in:
am: 488042fe3b
Change-Id: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f