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

Merge "[automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 9941ef79 -s ours am: cd410021 -s ours" into rvc-d1-dev-plus-aosp am: d8871767 -s ours am: fd510e21 -s ours

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

Change-Id: I786410234c3788b1e1ba8711d4eed7cbc5f6eda5