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

Change-Id: Ic28ed72f30d49da7bd137b4d4db125b895025ed0