[automerger skipped] Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev am: 8c06a845ac am: e3d1f5e2f1 -s ours am: 7823ca41be -s ours
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 fc7054d0e9 is in history
Change-Id: I119242b4e1657e198f93d2e768aea3906dbfffad
This commit is contained in: