Merge "Fix that fail to setup any vpn after Network Settings reset and...
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113
am: d2cf8358
* commit 'd2cf8358':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I676da29aa5322563b20a95afd504e3b4d68fd2a0