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