Merge "Revert "Revert^2 "Revert "Add CTS tests for exclude VPN routes A..."" am: e4f2b591de am: 9fca863584

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

Change-Id: I7ee8bf8b3650d7bc3099b2719cff96340c48764c