Merge \"Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: 442498681d\" into nyc-mr1-dev-plus-aosp
am: 14cc0fd5a3
Change-Id: I1b52da55c4a5ee489492d07c4c54089f6662f49c
This commit is contained in: