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

am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 816cc626c8 is already in history

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

Change-Id: I734b02a07f5b9ab4c5602e2b0741da45ac553187