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
* commit '265f4113':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d