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

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

Change-Id: If7016eb58a1524ef306ff58bdc495777e5dfbd13