Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965961

Change-Id: I3988e8d3df6819e5ef233e8c235488a17131f1b3