Merge "Revert "Add APIs that allow to exclude routes from VPN"" am: da37e0f471 am: d48a67e944

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927301

Change-Id: I2847af72de65564d3bda4145ebc05261e9fbe61e