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

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

Change-Id: I5088380ad4be6c198c5511981e0e3cd50027b72e