Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018

Change-Id: Ic399862188be78c5886a7f89f9e29be4c41da528