Merge "Add testVpnTypesEqual to verify consistency" am: edeab9051e

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

Change-Id: I18b5716252efc4f7c33ec8263c09df1f9396d1fe
tree: ca65b421364f0f23b1e4116aa7fd144d6b53f460
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING