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: Iba3df72496f067c5e0291449be3bfbd9ce2031ff