Merge "Add testVpnTypesEqual to verify consistency" am: edeab9051e am: f16388a8f5

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

Change-Id: Id2e9d16c88088ef5d3ffe6f698af5ee8201c7716