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

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

Change-Id: I7cd9bc4cb5e7ff27e773137cb73a490733b27170