[automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 9941ef7930 -s ours am: cd410021a5 -s ours

am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 8e53c79556 is in history

Change-Id: I2c65d4269c9774ee850ebaa0c9ee6bc41c9aec62