Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and...
Merge "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" into nyc-mr1-dev-plus-aosp
am: aeb86ec3
* commit 'aeb86ec3':
Change-Id: I84476b69eac613027d239b9b07b639d071aa3e29