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: Ie569c72d63ce866b08bd6ccb18f7b0ef1437f6d3