Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047

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

Change-Id: If7d654a347b562859389a171c1d36b82580f2038