Merge "Disable always-on VPN in factoryReset"
am: 9847e78b72

Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8
tree: 80f5086fcb7a2b980a509fa6e45cc6e2af3e3d49
  1. core/
  2. services/
  3. tests/