Merge "Add configuration whether to exclude local traffic in the VPN" am: 80178db312 am: 0ea8189d38 am: 4974ca5f52 am: ba123cee70

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

Change-Id: I431fe80bf87637e50f1cf3023ac59cad9bc8a05c