Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: 6cbf4e5119
am: 01dbfb8b2e

* commit '01dbfb8b2e36ffe7b047395f5a66f8196a6fc0d3':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I4641b2813820c82cc8509e0ba27f679733d45d6b