Merge "Fix a bug where VPNs start out suspended on cellular" am: bd3a7f994d am: cbb9c78350

Change-Id: I368308ded731b221be7fae6ddf1723c587ae4d20
tree: 53fe2b2f8fcc1d60fea415447359150eebdccba7
  1. core/
  2. services/
  3. tests/