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

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

Change-Id: I53d58c5b2277ba2d88a848ed3e6d6269b4b886b3
tree: 50724222702939452a6c70c34657b55c1b8d2314
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING