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

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

Change-Id: I958918559aaf4447e45f7dcde65d2b50caabcb1a