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: 0ca903017c" into nyc-mr1-dev-plus-aosp
am: ebe9d7bf99
* commit 'ebe9d7bf99d0ad8289e9e29f07c0291f7b41432d':
Change-Id: I84476b69eac613027d239b9b07b639d071aa3e29
This commit is contained in: