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

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

Change-Id: I91b2ece57f79308436cf34ab3fbf9cdbd6961ed7