Merge "[automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours am: 63f7b0c405 -s ours" into sc-v2-dev-plus-aosp