[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

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

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

Change-Id: I4d3936f7c5b8376cedce975da5130826974fa0a4