Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4 am: fc546021bb am: 4820e9d4e4 am: 9da9925389

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

Change-Id: I38622f04de2e66d11115318831a83667a76ef02c