Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e am: 233682e675 am: 92bc335785

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: Icd7cf6f3cf36685e0b4b243030a78187b1fc7c79