Merge "Use RouteInfo API constructor in VpnService" am: 6b501d8acf am: ec10603f92

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a5acb985f2f6514af6ff06290dafeb32de9d35b