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

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

Change-Id: I4a7d56abb55dee7c95aaa5584f6273504f0aa16c