Merge "Disable always-on VPN in factoryReset"
am: 63c14e0ab6

Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8