[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 am: a8caf45e -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 bd13c96a is in history
Change-Id: I65e82972439bd524fedd0906596aeaaf2dac83fa