Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: d2cf835880" into nyc-mr1-dev-plus-aosp
am: aeb86ec3bf

* commit 'aeb86ec3bf8c39a29efe8a846472846cbec16103':

Change-Id: I84476b69eac613027d239b9b07b639d071aa3e29