Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3 am: 9ca145bcfa

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: Idb987331163fde7019febdcbf3e28bf205894d37