Merge "Use API RouteInfo constructor in VpnConfig" am: 78426b28cc am: 5f2a3aca17

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib005c7b3c640f88e89868ff334aae5dcfd7f3852