am c22e0c80: Merge change 20719 into donut

Merge commit 'c22e0c8012828474e8aa2e29b441ef02728b0842'

* commit 'c22e0c8012828474e8aa2e29b441ef02728b0842':
  Fix order of setting/saving state in VpnService.