[automerger skipped] Merge "Fix a bug where VPNs start out suspended on...

[automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 9941ef79 am: 673b20e1 -s ours am: ea177634 -s ours am: a666aa1f -s ours

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

Change-Id: Iad86ff2fad4ac97e2e77bbd8f5dc8d71c18794e1