Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4

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

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de