Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" am: 67197b7ed6

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

Change-Id: I79923b432c049fb8e2cbd42d97f49e78d0631b24