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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9744bf5c35097e61ad09fda98f2c843aeb6b9545