Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19

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

Change-Id: Iffa989b5fe71ba259e1d4221ae203b746ad7ddd1