Merge "[automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4 am: 69955037 -s ours" into rvc-qpr-dev-plus-aosp