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

Change-Id: I368308ded731b221be7fae6ddf1723c587ae4d20