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

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

Change-Id: I0827c33efc8661a1788f124812c9685bfa57733b