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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc64e9dfa4dd56ef817469e2ecffcb662b64c8de