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