Merge change 20719 into donut

* changes:
  Fix order of setting/saving state in VpnService.