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

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

Change-Id: I9424e074f4b0bf152f7dc2fd50c6bafe8a9b5daf