Merge "Only set excludeLocalRoutes in the bypassable VpnProfile" am: b70a0862ff am: bfc4c06f12

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1944537

Change-Id: I3384a2d59f38921c21cfe60aab8a080a96d8ccbb