tree 50724222702939452a6c70c34657b55c1b8d2314
parent 54fefcff7d5523e356ab4f60511dc6901f1433f6
parent 544e7294c19486e97688cc8a1abbcc3af51937c9
author Ken Chen <cken@google.com> 1620874817 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620874817 +0000

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