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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c4169ff740b8cb67bae6b85e17a79fc39e40247