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

Change-Id: I99207281321861a3e720b5c1e2e316e12b104677